Fixed 2 Warnings