Add a few minor tweaks for better and more obvious configurability