Improve macspoof again