Should patch some visual bugs