Warnings Fixed