Several tweaks