Updates to compile on 2.0.0-rc1