Fix the 2nd-half woes,