Small changes to work with 2 build nodes