Small changes

Here some patches that might be almost safe to include.
- You might ignore e5a3d88 since it is quite borderline standard.
- I'd like to have a second opinion on 189674c and 6fcd711 since I'm not used at all to the codebase. 
- The rest looks sort of safe.