include the -thread oasis fix + various fixes