Fixes for visual whinings