Fix width/height to take stroke into account