Improvments and updates for Jenkins / AWS interop