More target framework fixes for 5.0