Orthononalize bug fixes
Merge pull request #1852 from paulmach/ortho-bugs

Orthononalize bug fixes