Fixed some more issues while building Swarm.