Minor functionality enhancements