Misc. fixes to previous commit.