Fix even moar outstanding issues