More fixes for modern.