Gnex compatibility adjustments