Level 1 fixes, Level 2 in progress