Few fixes to previous commit
Fix path