Trim numbers for easier comparison and add postgres port