Better width and height handling with extension to SheetEnhancer