Various fixes (v1.02)