Fix moar outstanding issues