Bump to origin 2, fix specs