More minor tweaks and fixes