Build-time updates and fixes