-- Small enhancements and bug fixes