Bug fixes on console part 1