Minor fixes related to keyword parameters.