R1A02, minor fixes