Make sure we use the right dir path everywhere