Level2 small fixes