MOAR fixes for LazerUnicorns migration