More Dave fixes.