Fix some files, minimize diff