More build fixes, file additions and updates