FIX: Warnings and a bug...