Made some quick fixes