more dependencies build fixes and improvements