Enhancements

Please check / test / integrate these enhancements.
Thanks