Equipment fixes 2

Fix for #3049

(I may add fixes for other equipment bugs later on)