Updates to make build work
Working install