Pull request review

Review this diff and list only the blocking issues. For each one give the file, the line and a one-sentence fix. <paste diff here>