Finishing up changes for noscript stuff