Changed some stuff to make the code analyser happier