Checking in more fixes
Checking in more work-in-progress