(Rice) Build fixes - get rid of BOOL