Fixed up filepath parsing issues.