Fixes for content