VCloud Director - Bug fixes

@mikepea - as agreed here are individual commits.
This one is for the bugs