Fixed some errors with entities and the resolution.