Fix for mavgen import