Avalon: Minor Fixes

Minor Bugfixes.