Build failures fixed