Pull in some changes form 0.6.0