sb fixes for certgen + keygen