Some oncommitted changes for a while ago.