Fixes a few small things