Fixed system-conf stuff