Fix jar_entries and account_entries