Fix UMD Issues