ccslint and minor changes