Fixes for problems on multiple org browsers