Small corrections after last commit