fix sources and build