Built fixes from #49
v0.12.0