Jam all the fixes in one PR