Fixed some stuff to make it release ready.