Few fixes since we have change entry type