Small fixes in width calculation