Fixes to pass puppet lint