Fixed more organism interface code