Fixed a few additional issues