Final small changes before sprint