1.6.fix warnings

The code compiles now with -w Ae and -warn-error A.
Adjusted