Fixing some things under the hood...

We'll be up in a bit!