Small fixes after loading real files