Fixed builder tasks