Small changes on various files.