Trivial enchancements