Minor framework tweaks.