Some Bug Fixes 6/17