Fix deps and build