Fixes to run automation on server