some dbcontext fixes