minor language enhancements