Fix misused keyword arguments in various places