Changes to fix some bugs