Fixed some other things...