Reference a couple more fixes that were merged into the v0.2.x branch