Fixed some final stuff