Framework 4 fixes