More quickfixization