General cleanup
Checking in minor fixes