Several console related fixes #2