fixes for compilation under 7.0.1 (gcc481)