Fixes for the recent i/o function renaming.