A couple fixes after refactor