Fixed mistakes in wire commit