Several tweaks to make sure things work.