Some more minor enhancements to sambot