- Fixed a few other issues