v0.1.8-pre2

More bug fixes