Last camera ready changes