Add better support for HK/SLP1 'G'