Updates to fix 1.0 changes