Some small tweaks/enhancements