Some code fixes before GMU