More auto* build fixes