Cleaned up Warnings