Fix up PATHs