Correct tab damage introduced in previous four commits