FIX: Deal with warnings and err