Some tweaks...