Last modifications before submit