Sync final build changes

This synchronizes changes proposed in #32