Update fork from upstream