Fix issues left from last re-organistaions.