minor framework improvements