Ebean fixes