Fixed autowhitelisting issues