Fix rendering in twoUp mode - followup fixes