Partial fixes for sync from multi-db to megatest.db