Plugin Functionality Fixes after testing on PIE