Wall collision bug fixes