fixes to cbuild