Enhancements, fixes