v1.2.2a minor fixes