Some framework things modified.