Added some fixes and that getters tried to access empty lists