minor fixes for null values