Fix dependencies and build