operserv/rwatch: More fixes to legacy db load