Bug fixes for various issues found during testing
Testing updates