Fixing issues with Custom Actions Processing