Minor tweaks, bugfixes and improvements