Fix some keyword args