Little tweaks and improvements