Some post CWR updates