Fix issues with old configs and some puppet-lint