CLOUDIfY-2644 more fixes