Fix level issues