Fix even moar outstanding issues

:cake: