[FIX] exiv2: Fixed up a few issues identified