Fixed some quick bugs