Fixes to solum around entities and serialization