Several console fixes