Some minor fixes for warnings.