Added lookup of port from system property too