[merge] Minor fixes and enhancements