More Bug Fixes