[IOT-1405, IOT-1418] Bug fixes