Initial attempt at fixing build