Fixes placement of system properties