minor framework tweaks