Merge CAEN fixes