Dog Brew: Bug fixes

Fix bugs with places where you can get stuck.