Fixes for shifting things around