Fix controller imports