v0.12 Did some quickfixes