[c2773] Fix more warnings

(based on commit 1ec6efa)