Fix shade whispers and other stuff