FIX: Fix warnings