More curriculum fixing