Bug Fixes

Same as below