#107 - Fixes for AW SBB Mages