[merge] Various console things