Merge database/ladder fixes into production