Changes to make build work correctly