More fixups, deps for client not just server