Minor edits to get build working