Add missing 'x' and port changing helper