fix dep and patches