yet more build tweaking