Fix filepath issues