minor: fixes for new builders