Better width/height handling