More fixes for warnings