Auto Upload and On boot upload fixed