tiny build cleanup and sync CHANGES