Various Bug Fixes
Various Bug Fixes