Response content fixes