Slightly improved umd support