[FIX] XQuery, File Module: minor fixes