fix a few minor bugs with new cloudstack models

I've fixed a few small bugs with the new cloudstack models that I added recently
Maybe we should just remove this instead of commenting it out? If you think it should stay then maybe we could at least add an explanatory comment? Otherwise I just worry that we'll come back to this without context later and find it confusing. Thanks!