Fixes for modern targets.