Minor tweaks and improvements