Level 2.10, minor fixes