fix fluent calls in admin clasess; small fix in legacy database class