Fix for PLIST issue
Fix pkglint warnings
Fix for PLIST issue