Use credentials from machine launching job and small fix