Various fixes
Various fixes