Fixes after gm