Minor fixed
Various fixes/improvements