Updates to make it compile