minor framework changes