Moah fixes
Use library for cloudstack