Some minor enhancements to Star