some adjustments in deps and sources