JCLOUDS-457: Fix some nits

Fixing some minor issues