Merge latest fixlint changes