Minor tweaks
Some tweaks