Fix some more issues found during code review