More level selection fixes