Cleanup
Add missing defines