Minor modifications to suppress compiler warnings.