Level fixes part 2