More **kwargs key fixing (#302)