Commit to fix sharing jobs
Merge both two computer fixes