Small Bug Fixes.