Merge branch 'fix-everything'