Fixing Warnings