Various minor tweaks and fixes