[z2624] Fix various warnings

(based on commit 568de8c)

(based on commit [s2659] - a9dc5df)