Fix gemrc / minor general changes