Console parsing fixes, etc