fixup + always use abspath