[z1988] Some more warning fixes

(cleaned version of 287d230)

(based on commit [s1610] - 6e32e7e)