#28 tweaks