Misc fixes

Just use git blame.