Fix expert mode errors