Fix some bugs with keyword arguments.