Fixed even more things