Makefile fixes
Add files
More build fixes
Final build fixes