few more avalon overrides