Small modernizations and fixes.