Fixes to Level 2 and 3