Also fix tracking for golem and skeleton