Bug fixes with walls