More prep for 0.9.1.1