Cleanup after brushing much dust off. Some changes to building and some
old changes never synced.