Minor Bug Fixes

Oops. We all have them.