fix commit to foget to commit some modified files in previous commit.
See previous commit message in this modifications.