Tweaks from toni machine.