Fixed some tab issues