Fix remaining path bugs