A couple of subtle bugfixes in content renderer after a little too much freewheeling. Picked up by tests thankfully