Fixed tab-space stuff