Fixed some tab-space issues