#2333, more fixes - right order to get fqdn right