Some tweaks

Some tweaks