Updates to allow building