spam fixes