Fix PLIST matching
Fix build target