Adapting to 0.10