A number of framework fixes