Removed Possible Warnings