Minor fixes for nullable params.