Miscellaneous Fixes

Miscellaneous Fixes