Cleanup for release

Fixing a few more things =)