Adding missed tweaks