Fix various minor issues with the new API in the content server