Fix for keygen & SIN creation breakage