Fixed a few issues here and there