Fixes for CRS serialization bugs pointed out by John Floyd.