Small adjustements to previous commit