Level2 Client fixes