Switch to shortguids