Some small changes for issues