Grid search tweaks