Some fixes for Galaxy gamma