Fixed the analyser setup
CS fixes