FIX: A lot of warnings resolved.