Fixes for recent compiler changes.