minor fixes
fix for null values