Minor Bug Fixes 2