Minor Bug Corrections