Fixed entry type issues