small adjustments to db construct messages