Minor Bug Fixes

Fixed some cosmetic bugs.