framework fixes