Minor enhancements for fixing new issues