Initial round of fixing...