Gruber fixes