Fix some visual tearing