Add expat to build and first working build