Fixed some half work