Fix some other warnings