fixes for UMD