Fixed some whizz