A lot of stuff in trial settings fixed