Start to make local paths really local