Fixed dependencies on build tasks to be a bit more demanding.