Semantic Analyser bugs fixed