Two More Bug Fixes