Some small changes all around