entries fixes