Fixes to initiative re-ordering