Add better g2 support, clarify error messages, remove sbl code check