More userscript fixes