Updates to make compile