Check all interns build correctly

Bug fixes and tweaks to ensure all interns build correctly.