CLOUDSTACK-5674: Few new fixes