Fixed error and prop spam