[z1931] Some warning fixes

Signed-off-by: Nighoo <nighoo@gmail.com>

(cleaned version of 338454e)

(based on commit [s1515] - 7620dea)