Fixed some issues with ContentManager