Prepare for itc-localized-screenshot-uploader integration

Minor changes, and other crap I stuffed in