Minor Bug Fixes.