Further changes to improve skeleton installation and handling running jobs