Upgrade builder
Fixing Rewinder bugs