Some build issues resolved