Multiple Minor Bug Fixes