Made some quick patches