Fix basic properties.
Fix NPE.