Immutable Params and Update Catalog Fixes for CL

Sorry for merging two things. I am ashamed.