Fixing Policy submission issues