Fix files and path calls in some places