Bug Fixes

More Bug Fixes