Next try at fixing build