[minor] A few more improvements