Minor Bug Fixes

Minor Bug Fixes