Level 2 fixes;