Minor changes
Fix NPE