Various tweaks/tests