Better handling of height/width