Merged latest fixes (v0.2.16)