Fixed some Equipment-Bugs

thanks @romain-durban