Fixed rewrite typo.
Fixed build order
Cleanup