Simple stuff

Here's a full commits to fix a couple small things.