Little fixes to automation process