[Fix] Couple of edge case fixes
[Fix] Merge updates from main-branch
Mainly includes cross-browser compatibility stuff