Cleanup: Fix broken Avalon driver