More fixes after minor refactor