Some ContentHolder fixes