More fixes for Gummy