Fixes for ccsr