Fix system property handling.