Fix according to suggestions.