Additional fixes I discovered while testing.

Testing.. A novel concept..