Tweaks to suppress compiler warnings.