Minor bug fixes to changing lineup