Some fixes for Galaxy gamma 2