Fix issue with booleans. Minor update to entities.