Content Manager fixes