Various tiny enhancements