Minor corrections on last commit [31dd4]