Updating some small issues