Update stuff for Cheese 0.6.5