Some changes to be ready for the active database