More fixes (so now it works fine...)