More abuild fixes, the previous ones weren't enough. Hopefully this covers everything.