More Wall Fixes