Minor db improvement