Updates for latest 0.13 nightly