Update to work with upcoming 0.13