Various fixes2