Upgrade to latest SDK (use Rectangle instead of Rect)