minor behaviour tweaks