Improve deps building