More Bug Fixes...