Fixed equipment related bugs, fixed Vanilla-240

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>