- Fixed a few small issues