CODE: Fix a number of warnings