Just a few miscellaneous tweaks, nothing serious