Fixes for LazerUnicorns migration