Minor fixes on null value handling.