Small adjustments to the last commit