Slight refinements to database calls.