More multilib fixes