CLOUDSTACK-5674: Few fixes