Bug Fixes II