Fixed a couple other edge cases.