Fixing some of the content