Some more lineup tweaks