Fix white backgrounds in some places