Fixed build errors.
Cleanup.