minor improvements

additionally fixes #2718