Fix path bugs