Some tweaks reverted