Some small changes to polish a few things up.