Small adjustments

TBR