Start entity fix + Catalog item comparator fix

A couple of fixes after testing.

Branched off of #314 but doesn't depend on it.