More console fixes