Multiple fixes

No, this is for nodepool, but the solution is not yet cleaned up. 
Also, this assumes the changes in my os-ext-testing repo.....