FIX: Fix warnings

Ask and ye shall receive.