Fix all violators of E231