trebuchet fixes

this fixes the build. 
there were changes in cm10.1 trebuchet that had broken it.