Updated to latest refs
Make rebuild less painful, current directory affect on make scripts