Add support for non-standard port and database values, remove dangerous information from debugging output.