Fix according to remarks.