Fixes for compiler changes.