Re-added the list target + fixes to some paths