Small fixes2