Fix issues found by Chris