Some minor stuff for 0.5