Updates to enable uploader etc.