Small fixes
Use pathlib