More stuff for 0.9.6