Bug fixes for puppet manifest