Fix inital builds