Improve frandom detection a bit