Bug fixing

Hello folks,

I’m doing some bug fixing today. You may see several commits to the trunk. FYI.

Josh