more build tweaks for tarvis