random build fixes