some final fixes for cpn