Changes required for next build environement (make/pip)