Fixed up tab stuff