More Bug Fixes

Miscellaneous bug fixes…