More Console fixes