Fixes and reshuffling