Moar multi-fixes