Bug fixes for G shape