Some Warnings fixed