Updates to match 0.9.5 compiler