Remove a warn and some other minor stuff