Warnings fix

Fixes a few warnings