Fixed errors with stuff