Add a little method...
Various fixes