Some Bug Fixing