Some small changes.s