*8094* Minor tweaks
*8094* Minor tweaks