changes for portable compilation