Start entity fix + Catalog item comparator fix

A couple of fixes after testing.

Depends on #314