Fixed even more bugs again