Fixes for Gummy