Content bug fixes