Content Plugin Fixes