[z2625] Fix more warnings

(based on commit 1ec6efa)

(based on commit [s2660] - 0cfc0ff)