Minor tweaks and preparations.