Pulling to fix some bugs