[RJA-xxx][fix] micro optimization & bugs