Some addictive fixes.