Fix width calculations