Discovery compensation for DB and layout fixes.