Fixed wall issues