Fix closure paths