Small issues

Fixing a few of the smaller issues