BUGFIX: fixed more analyser warnings