5.4 Updates

Better wipe detection