Fix messing up optional args and a warning