Fixes for svy21 conversion.