Fix warnings

A few more warnings removed.