More small changes to match DB