These changes were ignored by now, but will be reviewed later :o)