Avalon4: minor changes