Fix Equipment NPEs