Tweaks and improvements