Update for nova modified source tree