[FIX] Core: File-system locks revised