Fix suggestsions from ravage84