Fixes for UMD