fixes for g8 wrapper