Bug fixes, code changes, etc.

Bug fixes, code changes, etc.