Some code fixes (v0.1.1.a1)