Some little fixes on latest commit