atlastool buildfix (yeah, it's still a mess to build, I know)