3rd scan build fixes