Various fixes

Noticed these as I was checking filediff against last version.