Minor fixes, issue with cbirrt example