Gruber fixes
Final changes