Minor subset improvements.
Use latest CCC in build