Code tweaking, bug fixes for uploaders