Fixed more stuff Unnar broke