Fix some additional warnings