Small fixes
mmm