A few little fixes

No, I don't think I will have something to do on these files anyway :)