Various fixes
Various changes