Tab generation errors fixed