Fixing some things up.