Fixed failing builds