Fixed new analyser warnings