Last minutes improvements