WIP: tweak build