Fix fixes that were fixed before