Update for latest bryg and build changes.