Fixed some warnings

And a use != 0 to == 1