Fix some problems with swipes