Other Bug Fixes