Fix path resolving