Fixed even more stuff