Fixed some analyser issues