Fixed build problem with missing etc.
Cleanup.
Fixed schema