Don't push objects into walls and fix bug in previous commit