Better path resolving