Code style changes.
Prevent errors for properties that are optionally available.