Sync

ohShi fixes