Fixed bugs after final test on preproduction