Fixed imports pointing to upstream