Working on adding fixes.