crs code fixes