Fixed compile errors after moving enums