Fix hostname
Fix generator