Fixed more stuff