Fix build tasks