Little fixes to level2