Content fixes