Fixes to address compiler warnings.