Fix tabs issues