Fixed some minor bugs that did not account for the way CloudStack handles things