More 0.6.0 compat goodness