Fix issues with UMD