NOREF: Fixing some catalog compilation issues