Add WiredKit and WiredData back and fix cross compiling issues