Fix Console bugs