Fixed some swiping issues