Fix IOException API > 1.5 usage + minor cleanup.
8 files changed