fixes after console refactor