More Target framework fixes for 5.0