More Bug Fixing