Fixed some last things