few fixes to 2nd level