tools: more build convenience work