[TACHYON-217] Finally and close() fixes