Ok, some small enhancements