Bug Fixes

View commit comments for more details