Some other minor tweaks...