Updates to fix initial errors